Issue #13: small improvement in speed