Self healing (37/37)

Self healing