added correct pathing support