This is a good temporary fix, but a todo here about handling this during the refactor would be really nice as well.