Committing fix for issue #1.