Cont. fixing #730765