port to 70X of #91