merge Tom's patch which fixed issue of across all browsers