Messages are correctly identified now based on the header.