Fixed issues with safari