Fix for format errors in file provided by CNAF