bugfixes in sync