removed redundant limit check