Closed issue 43.