issue #6 bug correction