Fix  #2252