Fixed merge issue from Job scope merge