Fixing up for safari