Self healing (18/37)

Self healing