Fix issue  #115