Fix for Harvest tools speed issues