Improve stability (33/35)

Improve stability