Hero is not replaced at the end of the wave + end of wave fixed