prevent way danglers, issue #1373