Fixed handling of conditionals