Fix disabling