Self healing (5/37)

Self healing