fix path
CEXT-685, CEXT-689, CEXT-686, CEXT-687 #Fixed