Merge "Fix path after file got moved"