Fix creation of subjobs