Fix evaluation order