issue 21 fix changes