bug fixes
Prevent overlap of jobs