Fix return code2