Fix wrong type parameters
wip
wip