Make better check in presence of typed holes