No inifinite loop! Works now...