An attempt to fix #97