WI - fixes exception on WAITING tasks

closes #154