Fixed number check loop issue

Please test