Self healing (17/37)

Self healing