Handle synced flag properly