Fix empty messages