fixes #335 - Tasks Stalled