improve messages fixing #779