The official patch notes state that a "more robust" solution will be implemented in a future update.

Our Kingdom Come Deliverance 2 Devil's Pack quest points out how to deal with Bohuta, Matthew, Ranyek, Adder, and Janosh with the best outcomes ...