Bug fix for issue #1