This should fix #11