fix synchronization issues