Issue #36 Further fix to bring in line with 2014 EFF report