fixes  #651