Fix parsing messages with several fields