Stability fix 2