Fix disabling issue