Is anyone bothered by the location (side by side) of the diesel and water filler pipes. I know I am and am planning on putting on a different cap for the diesel with a different tool to open it. Anyone solved this? JohnM 1999#574