REF: add check that updating doesn't stop to prevent endless loops