Should the type check have been removed here?