bugfix & Google Analytics