Bug fix for issue #5