This should fix #6