Maybe we need to fix the types one more time.