Finalize Fix for Issue #198