more updates for issue #986