GPDOM bug fix