fixing to handle custom jobs