Path fix

Fix for crazy self-duplicating paths.