Bug fix for issue #6