Fixed path merging for this file. TODO everywhere else