#438 temporary fix for TaskTracker races