Patch from James H to fix a bug in which ambiguous puzzles would