Add protection against load-save loop