Corrected option gathering