Corner cases enhancement for Firefox issue.