Fix motd handling