Improve stability (9/35)

Improve stability