Another attempt at fixing path issue