Fix listener issue