This should fix #22