Possible fix for the bug #21174