Remove hidden buffer check