Job class fix