issue 16 resolved