Bug fix: issue #9