Fixed - issue #34