Changed check to accomodate 8 messages