diff --git a/src/baseloop.cpp b/src/baseloop.cpp
index c6c210a7..22c312e4 100644
--- a/src/baseloop.cpp
+++ b/src/baseloop.cpp
@@ -159,7 +159,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 
 			if (!busCommand->isErrorResult()) {
 				// decode data
-				Command* command = new Command(index, (*m_commands)[index], busCommand->getResultStr()); // TODO use getResult()
+				Command* command = new Command(index, (*m_commands)[index], busCommand->getMessageStr()); // TODO use getCommand()+getResult()
 
 				// return result
 				result << command->calcResult(cmd);
@@ -214,7 +214,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 				// decode result
 				if (busCommand->getType()==broadcast)
 					result << "done";
-				else if (busCommand->getResultStr().substr(busCommand->getResultStr().length()-8) == "00000000") // TODO use getResult()
+				else if (busCommand->getMessageStr().substr(busCommand->getMessageStr().length()-8) == "00000000") // TODO use getResult()
 					result << "done";
 				else
 					result << "error";
@@ -283,7 +283,7 @@ std::string BaseLoop::decodeMessage(const std::string& data)
 				L.log(bas, error, " %s", busCommand->getResultCodeCStr());
 				result << busCommand->getResultCodeCStr();
 			} else {
-				result << busCommand->getResultStr(); // TODO use getResult()
+				result << busCommand->getMessageStr(); // TODO use getCommand()+getResult()
 			}
 
 			delete busCommand;
diff --git a/src/ebusloop.cpp b/src/ebusloop.cpp
index a4b4c6b3..e3466291 100644
--- a/src/ebusloop.cpp
+++ b/src/ebusloop.cpp
@@ -115,7 +115,7 @@ void* EBusLoop::run()
 			// add new bus command to send
 			if (busResult == RESULT_SYN && busCommandActive == false && m_sendBuffer.size() != 0) {
 				BusCommand* busCommand = m_sendBuffer.remove();
-				L.log(bus, debug, " msg: %s", busCommand->getCommandStr().c_str());
+				L.log(bus, debug, " msg: %s", busCommand->getCommand().getDataStr(true).c_str());
 				m_bus->addCommand(busCommand);
 				L.log(bus, debug, " addCommand success");
 				busCommandActive = true;
@@ -167,7 +167,7 @@ void* EBusLoop::run()
 				lookbusretries = 0;
 				m_bus->sendCommand();
 				BusCommand* busCommand = m_bus->recvCommand();
-				L.log(bus, trace, " %s", busCommand->getResultStr().c_str());
+				L.log(bus, trace, " %s", busCommand->getMessageStr().c_str());
 
 				if (busCommand->isErrorResult() == true && retries < m_retries) {
 					retries++;
@@ -179,7 +179,7 @@ void* EBusLoop::run()
 					if (pollCommandActive == true) {
 						// only save correct results
 						if (busCommand->isErrorResult() == false)
-							m_commands->storePolData(busCommand->getResultStr().c_str()); // TODO use getResult()
+							m_commands->storePolData(busCommand->getMessageStr().c_str()); // TODO use getResult()
 
 						delete busCommand;
 						pollCommandActive = false;