[FIX] Antique calc

Merged Agustín Maio requested to merge RR-280 into 12.0-stage

Closes RR-280

Merge request reports