Temp fix for synchronization issues