mdsumner fix #3 (needs fix upstream too)