attempt to fix #91