Fix options being cleared