fixes  #3045