Fix amazon break