issue 17 again