fixed #40