Fixed disabling order