Bugfix/paths