diff --git a/reflector/Callsign.cpp b/reflector/Callsign.cpp
index 328c5e1..940c334 100644
--- a/reflector/Callsign.cpp
+++ b/reflector/Callsign.cpp
@@ -168,8 +168,7 @@ bool CCallsign::IsValid(void) const
 	// is an letter or space
 	valid = valid && (IsLetter(m_Module) || IsSpace(m_Module));
 
-	// dmrid is not tested, as it can be nullptr
-	// if station does is not dmr registered
+	// dmr and nxdn id is not tested, as it can be 0 if station is not registered
 
 	// done
 	return valid;
@@ -177,7 +176,7 @@ bool CCallsign::IsValid(void) const
 
 bool CCallsign::HasSuffix(void) const
 {
-	return 0 == memcmp(m_Suffix.c, "    ", 4);
+	return 0x20202020u != m_Suffix.u;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////