build fix (missing refactoring). Still issues during runtime. WIP