issue 65 fix