Fix #212 again, resolving type arguments