Fix TaskName in wrong place