Option persistency fix.