issue 108 fix