Choice bugfix(?)

Hope this would solve the bugfix