Simplify forwarding

This is just a minor simplification though tripped over some time ago