Self healing (4/37)

Self healing