Bug fix: Issue #6