fixing limiting checks