Listener and scaling fixed