Stability improvement

This is the correction included in this hotfix.