Fixed #424. Added a conditional that attempts to prevent changing jobs from... Closes #424 See merge request !179