Fixed to work with directory rework