fix bugs in task choice :metal: :dancer: