Self healing (8/37)

Self healing