Fix yet another issue with old IE and Safari versions

Change-Id: I243b8445d96ff5d510f5f43b61bab20e54492251