fixes  #2525