Fixed another double counting bug in BuildPuzzle