Improve stability (16/35)

Improve stability