Hotfix of GA tracker