Logic fix in geometryCalculator