Fix options passing.