fixes  #3228