fix to issue #2