Final fix for sync