fixing synchronization issues.