Fix error when quotes were in evaluated expressions