Fixing busted conditionals