This should fix #21