Fix: avoid losing message meta-data because of weak type evaluation