Stability improvement

Created by: yglukhov

This is a follow-up to 7601. I'm not sure if there's a possibility of such case, but anyway...