Fix for safari in place - working - needs some love