Restored HvCalc to normal