Choices cannot be fixed

This PR is for http://forge.taotesting.com/issues/2965
handlers were added multiple times