Merge pull request #4576 from koying/fixamcart