fix issue  #35