bug fix #6
bug fix #6