Task #150: Add fix for Safari