Fix empty cpeid values, thanks to Mulkieran/Mulhern for the patch