Fixed issue  #869