Fixing AWS