Fix for Safari and Firefox. Part 2.