Resolve Firefox issue