Remove buffer check unnecessary