Yup, this needs to be fixed.