fix refactor oopsie