ANTI-381 Fixing Paths