conditionals fix