Fixed issue  #97