Fix some syncer logic (possibly fix #200)

Signed-off-by: Daniele Ricci <daniele.athome@gmail.com>
Merge branch 'master' into audio_message