issue 17 correction