Forgot to update the code for other cases.