Fixing adding HRVO library, Part2