issue 18 resolved