fixes  #2337