last bug fix for GPDOM (for now anyway)