Dybbuk Bug

Just lost a run due to Dybbuk dying and the fight not ending, the first time I thought it was a bug with the cat he possessed as he didn't get spit out when I downed the cat. Save scummed to reset the fight 2 more times to the same issue, then Steven took over and it played the same again. The only thing I can think was causing it was the tornado map effect as the tornados were still spawning/ counting as enemies. Now I gotta cycle through beanie for the quest items again :(