Fix the return code