updated for safari/8