fixed listener issue