An attempt to fix #67.