closes issue 5 2