issue 8 fix