Attempt to fix #96