Fix Amazon handler. Closes #173