Fix OnLeave