new build - fixed analytics issue