Works again after refactor