should fix #59