Minor fix
Add support for conditional operators