Sync for regression fix