* Unfortunately the resolve-path patch was overwritten, so here it is again