Fix return code