Fix job queueing flow