fix amend issues 1 and 2