Fix choice bug