Fix for #10