CFY-1025 fix paths