fixed naming conflict; avoid message find exceptions