Fixed order of operation bug

Fixed a bug that caused additions to built after unary functions in the
expression tree