#5423 fixed