Infinity Bug Fixed