Fix for Chrome Issue 140433003

Solved Chrome Issue 140433003, https://codereview.chromium.org/140433003