#160, fix analytics code