EVP bug fix