Fix to generic type handling issue.