* Stability improvement

