Fixed few taksk problem