Bugfix on task