Fix #97 #99 issues and ets

See #97 issue
See #99 issue