Issue #225 bug in choice page