Improve stability (25/35)

Improve stability