Reply to Did your see the new code? / #1881

I think in most cases this should be sufficient?