Fixed issue with safari non-compliance