Merge pull request #2683 from hojjatabdollahi/hojjat/fix-chrome