Fix build

Someone forgot to refactor completely?