fixes due to  #471016