Commit: Added onDisable