Fix for a bug #21174