Small speed improvement, v1.2.6