fix ResolveMapped<T> return type to T