Improve stability (22/35)

Improve stability