This should fix #7