Update for an Issue #405 (fix for persistent options problem)