Bug fix for issue #991