Better fix for job arguments passing