prep to fix #91