15 Fix overlapping fire