#26 correction: no message type check needed