WIP: directory fix