Follow #606 hotfix-defaultmessage