[gh-669] Additional pull for #404.

#404 (closed).