Fixed listener issue