BUGFIX: in task.h, refactoring