Fix options order