Improve stability (23/35)

Improve stability