This should fix #13