Fix for !disable