Attempt to fix AWS endpoint issue