fixing #40