Fixed more then one message issue