Use the right return code