add code fix mentioned in issue #2