this should fix #85