fixing issues caused by simple messsage protocol integration