Bug fix on task select