Merge pull request #750 from reaperhulk/update-098e

0.9.8e EVP Workaround