issue #153
close #130