Merge pull request #1698 from shackbarth/chrome-fix