Work around for AWS issue