This should fix the directory bug?