fixed issue #40