Fixed missing listeners