Improve stability (3/35)

Improve stability