Fixed bug  #85