Fixed badPractice issue and added proper onDisable