attempt to fix #111