fix #40
close #40