I have the same issue with the Tomb fight. The others i have not encountered