An attempt to fix #110