Fixed listener and scheduler