update with issue #1 fix