issue 21 fix