Improve stability (18/35)

Improve stability