job fixes
merge fix