updated issue #2