Temporary remove stop condition other than fitness calls