Improve stability (19/35)

Improve stability