Closed issue #576