master: small speed improvement