infinity bug fixed