fixed some type parameters