fixed #40 #39