fixes  #2268