address issue #1