Fixing path expansion bug

No point expanding a path just to use the previous value!