Forgot another refactor