SPOT-2087, works around safari bug