ECMS-5712 Fix problem with symlinks