Fix sync issues with reset