Bug fix with large paths