Fix for different order of evaluation.