Fixed to select the right choices