Surihix added proper path support