closed issue 8-9