Fixing directory path assumptions