removed index checks since caught in message impl