should fix #6