Yup, probably the more robust approach.