Improve stability (1/35)

Improve stability