Bugfix: synchronize correctly