issue #2 fix