bugfix for Amazon