Fixing issue if different root directories