Should this be same for JobCommands? I can fix it along with the merge.