should fix #160