fixes  #2488