should fix #7