407 Hdi diesel 2006. Intermittent problem "jumpy" performance and black smoke that can clear up for no reason, say when the tank is refilled. Thought it might be dirty diesel and had tank drained and new filter fitted. OK for a while and then happens intermittently again. Often after heavy rain. Wondered if this was a coincidence or water getting into the fuel system somehow. Any thoughts?