Fixed #13711 -- Fixed problems with the previous commit.