Attempting to fix listeners