Fix for Issue #72.