Fixed for safari