quick fix for the analytics problem; simplified and testing on staging