first fix for #10.