Improve stability (32/35)

Improve stability