WIP - Dir problem
WIP - Dir problem fix