Resolve #1, and close #1