work with new version of message format