Very true James lol, another thing to do is take the filter off, give it a shake and empty in into a clear container, see if there's a lot of metal swarf in it, if there is it will mean the cam in the pump has worn. If that is the case, make sure you empty and clean out the fuel tank as well.