Fixing listeners