Analytics fix

Merge analytics fix into master