Fixing #991.