bug fix fix #87
bug fix #88