Fixed - issue #2