close issue 6