Fix issues #9 and #10