Fix EC issue on Fedora 20

Fix for #1143
Once I get the tests working I'll see how coverage looks and what I can do to improve it.