fixes for #9 and #10