fixes  #2961
fixes  #2961