Attempt to fix #102