TC34DA Engine Surge

[mac1520]

Hey guys, my NH tractor runs great until the temps get below 10 degrees, then on startup the engine surges at idle. Even after letting it warmup for 20 minutes. Move throttle up and bogs down and quits. Thinking water in diesel and need to change fuel filter?

Appreciate any help.

Mike