Fix/sync swallows messages