fixed loop to infinity bug in calc follow