Fix options passing