BUGFIX: Use base path