Fix for blank messages