Fixed issue when using other AWS regions