fix up message handling