if you help Higba The Tinkerer escape by letting him follow you and enter combat. the combat encounter will won't end after the enemy's are dead. this happened in every combat encounter when he was with the group. I think the system might see him as a enemy as well as a ally.
After i killed him in like the 5th encounter this happend combat stopt and the problem was solved.