fixed bug with G2