Fix choices not being related. Closes #323.