Fix bug and add change log