One more attempt at fixing paths...