fixed onDisable (hopefully)
fixed onDisable (hopefully)