closed issue 7