Fix GF Sync, again.