diff --git a/src/gui/server/request.h b/src/gui/server/request.h
index 4d2663f4071ec1e46d48420d2e4dc7df22b2b037..981838bf0d3c39bf58bb0b9b9b7f9d9edee25fdd 100644
--- a/src/gui/server/request.h
+++ b/src/gui/server/request.h
@@ -69,9 +69,7 @@ public:
       _account = *iter;
       _argList.pop_front();
       iter = _argList.begin();
-      // a call method can only begin by 'c' since it's only the client that 
-      // call with method
-      if (iter != _argList.end() && (*iter)[0]=='c') {
+      if (iter != _argList.end()) {
         _callId = *iter;
         iter++;
         // last arg is the destination
@@ -100,7 +98,7 @@ public:
   RequestGlobalCall(const std::string &sequenceId, const TokenList& argList) : Request(sequenceId, argList) {
     TokenList::iterator iter = _argList.begin();
 
-    if (iter != _argList.end() && ((*iter)[0]=='c' || (*iter)[0]=='s') ) {
+    if (iter != _argList.end() && iter->length() != 0 ) {
       _callId = *iter;
       _argList.pop_front();
     } else {