fix to #42
close #40