attempt to fix #67