Fix to use right dir