Kind of fixed aws