fixed message issue