Try to fix listener issue