Enhanced 8.1 to take care of symlinks