Closed issue #63