Fix for relative paths