Job fixes #618