Fixes #1 Problem with long running, large jobs