Minor speed improvement