fixing job handler