Temp fix for sync issues