Closed issue #7