work on #153, close #70