Fixed disabling issue