Fix for #10.