Got rid of checking the last message