Fixed - issue #8