Fix paths and use the clever trick from @dungpa