Fix for NRC puzzles