I think I may be getting water in the tank through the overflow. Are these things supposed to have checkvalves or baffles to prevent splashes from going into the tank? I recently filled up after having been out that day and noticed that water was spitting out of the overflow as soon as I started pumping fuel. I also had water in the separator that morning after the boat had been sitting for about 6 weeks. 