Fixed AWS problem