They should fix that water pump. Only 2 years old. I bought a 25 Etec 5 years ago. Only problem I've had was oil injection tube started leaking a little.