Fixing the gmd:pass element management