should fix #81