Another fix after refactor