Fix issue #56 for modern browsers