#278 puzzles fixed again