Merge pull request #4731 from bennyc-huji/patch-1

fix of amt bug