import choices bug fix