Here I don't think we need to remove the short circuit return