Fixed  #96