generator fix - better identification of message types