Fixed up onEnable