g+ fix up