Maybe run a tap through first ?