Forgot part of refactor of last commit