Self healing (10/37)

Self healing