Data dir dependency fix