fix return puzzles