fixed issues with synchronization