Fixing GA calls when required