diff --git a/DateTimeCore.cpp b/DateTimeCore.cpp
index 6dade96..8e911f8 100644
--- a/DateTimeCore.cpp
+++ b/DateTimeCore.cpp
@@ -223,7 +223,7 @@ char const *  GetDateTimeStr( const char * DateSeparator, const char * TimeSepar
     // Build String
     sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d",
                         Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day,
-                        Separator,
+                        ((Separator)? Separator : ""),
                         Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds );
 
     return (ReturnStr);
@@ -423,7 +423,7 @@ char const *  BuildDateTimeStr( unsigned char Day, unsigned char Month, unsigned
     // Build String
     sprintf( ReturnStr, "%04d%s%02d%s%02d%s%02d%s%02d%s%02d",
                         Year, ((DateSeparator)? DateSeparator : ""), Month, ((DateSeparator)? DateSeparator : ""), Day,
-                        Separator,
+                        ((Separator)? Separator : ""),
                         Hours, ((TimeSeparator)? TimeSeparator : ""), Minutes, ((TimeSeparator)? TimeSeparator : ""), Seconds );
 
     return (ReturnStr);