Merge pull request #1701 from shackbarth/chrome-fix2