Puzzlemodel fix 2