An attempt to fix #49