now fixed job handling