Fix for Issue #442.