Fixed to work with new message format.