Fixed Issue #5 where message type is also checked