Issue #14: Uncomment commented out code added during debugging of issue #14.