Bug fix with job splitting