Fix  #662