I have to fix the problem of #36.
fix #36