Improve stability (35/35)

Improve stability