Fix G handling