Fix for dir issue