issue 17 fix