yup, that will do it, good thing you caught that when you did
bit of a pain having to drop the tank to change the pump though, posibly the one and only thing that is good about peugeots, they have an access pannel under the seat to remove it that way (know what i will do if i need to change a pump)
should be good when its all sorted and at least you found a proper problem
Ian