Bug fix: issue #3