Fixed - issue #73