fix for back-to-back messages

Change-Id: Id800d219f9be2a6fb6b058b22ca6d7a717499ae9
Signed-off-by: Alessandro Salvatori <sandr8@gmail.com>