Fix message hiding bug