fix #1, resolve #1 and close #1