Fix for #297 enable() / disable() not working