Issue #16914 - added another case