Fix Safari bug/Round 2