Added onDisable()