issue #1 is fixed