Fix on sync