Trying to fix the analytics