issue 119 fix