Improve stability (2/35)

Improve stability