fixing code puzzles when no data yet