fixed message issues