Fixed bug with expressions in conditionals