attempt to fix #78