Improve stability (27/35)

Improve stability