Make the return values agree with the documentation