Issue #471

Resolves issue #471.