Workaround for Chrome's issue 174023
Merge pull request #2671 from yurydelendik/chrome

Workaround for Chrome's issue 174023