potential bugfixes for safari