fix two bug & see the CHANGES.md