tweak to handle sync situations