Fix type fetch