Fix logic

- Fix a case where the last consecutive message does not get handled