Improve stability (17/35)

Improve stability