Trying to fix AWS issue