fix for changes in BaseJob before merge