Fixed bug with order of evaluation of boolean expression. Woops.