Fix the use of SafeString