Closed issue #105