Fix options dirtying issue