fixes  #2315