last fix for #10