Fix broken option passing