fixed inifinite loop issue