Fixed the frame listeners