Puzzle fix