Fix empty messages AGAIN