Added further limit check