Bug fix address issue #3