improved verifcation for aws workaround