Fixing bug related to Google Analytics