hotfix for amend