Fixing paths for real this time!