fixes  #2354