Still fixing error in Safari