Closed issue #2