Stability fix (Non-critical)