Lps 42504

Hey @ipeychev

Here is an updated pull-request for LPS-42504. I followed your recommendation and it now works on all major browsers.