Improve stability (24/35)

Improve stability