better(?) fix for message collision handling

Signed-off-by: Jukka Laukkanen <jukkalau@gmail.com>