Another attempt at fixing paths