PuzzleMock fix