fixed #40
fixed #40