#25035 fixed