Improve stability (11/35)

Improve stability