SPEED. fixes lessthan3/packages#3700