Ahh yes, the old reach-around. I always forget about that. That could be done this PR.