Changes so that we only set the running thread if we actually ARE the running thread