Fixed onEnter and onExit