Bug fix from Issue #1