Closed issue #281