Fixes the issue. Tested for regression in Chrome and FF on Mac. Working fine. Might wan't to check for other web runtimes.