Fixing for Safari and Firefox