fixes conditionals