address issue #9