This should fix #56