Totally agree. @kagux could you send a PR for message change?