Fixed - issue #40