Calculation fix for EF