Fix job stops

Fixes #467, possible solution to #153.