Fix choices according to spec (now works with solution)