1.2.3 - Fixed OnLeave (#2)