Fix options storage