WIP: try to recover from missing syncs