How about we actually keep track of the messages?

Signed-off-by: Toon Schoenmakers <nighteyes1993@gmail.com>