Paths: Fix behavior with generic types
#1343
+52
−46
Merged