Calculation module fix