#191 scalable speed fix

This fix is ready for review