Fixing long paths