Fix listener, not sure what happened here