Merge fix for google analytics