fix #40 and fix #41

Due to this modification caused:
https://github.com/atom/tree-view/commit/aa0b017fd9292a28efbec23f06f1b90
4e7dcf1e9