#21707 Fixed