Bugfix using path variables instead hard coded location