Added latest patch for path resolving.