issue 15 fix shod