Fixed for Safari