Fixed - issue #68