fix empty messages