Needs fix in `register` as well