Implement @mdboom’s suggestion