bugfix for empty messages