Attempt to handle symlinks correctly