Fixed legacy calc bug