Fix another analytics corner case