attempt to fix #35