Browser compatibility to issue #18