Update to issue 34 fix