Attempt to fix synchronization issues