Attempt at fixing broken --job behaviour.