Fixing adding HRVO library, Part1