bug fix, #10