Improve stability (8/35)

Improve stability