This should fix #57