continuation of JRCSTU/co2mpas#490
continuation of JRCSTU/co2mpas#490