fix after refactor