Better conform to the PGM specification