and this should fix #10