fixes  #2279