fixed issue with Safari