Fix receiver 'end of task' problem