Improve stability (30/35)

Improve stability