Fix for string based messages