Merged in fix for symlink crash