Fixed broken Analytics