Stable. Fix to prior check-in