Closed issue #18