Fix drift due to unasyncing