Fix message not disappearing problem