Fix for mysterious job failing bug