fixed message handler issue