fixed gs tracking bug