Another fix after refactor.