Fix to cubepm.fh