Little logic fix for option checking