Bug fix for Amazon