bug fix #10