will patch in the rustio branch and see if that improves