- Fix resolving generic class